From 542aaa704ea8f653ae74e55727d6c2e225627179 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Fri, 6 Sep 2019 15:06:05 +0100 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 465136 -> 465424 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index ca188680a90..6de037ca54a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -300,6 +300,7 @@ export JAVAFLAGS=@JAVAFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ export JAVA_TARGET_VER=@JAVA_TARGET_VER@ diff --git a/configure.ac b/configure.ac index ae940b91ec145f0983f9501132af4525b77fd407..c716baff3771ebdbb001d81c2cbb040aee809574 100644 GIT binary patch delta 203 zcmeycQD(vxnT8g|7N#xC&abBzTCu1ZsCYSsIePkqxCR9TxdKUr%wmPo;>^5sg_4X^ zg{ah`e1$OISWPZY1t7>wQ<$#!lvz4YM#bqL_A+r#k91=apMJoDRbkqFCbj7wUNCb^&wI^WBI)QH9~|lw9HN1) feR`q;bIA02@0q#U?cOj0F$)m0Znt~Gwn+y7tqMg) delta 58 zcmbQRMdrgsnT8g|7N#xC&abCmRAf`0{^12P$MoVi%q7!RuQLTr|M!8Jt3B>5GZ3=? MG3)lYw``kq0Q>?P2mk;8 diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 363a8a41dea..bd05d4bba20 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -62,10 +62,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2